]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
extensionPrefs: Fake Config module
authorFlorian Müllner <fmuellner@gnome.org>
Mon, 9 Mar 2020 00:59:09 +0000 (01:59 +0100)
committerGeorges Basile Stavracas Neto <georges.stavracas@gmail.com>
Fri, 27 Mar 2020 23:33:30 +0000 (23:33 +0000)
We include config.js because it is a dependency of ExtensionUtils,
but it's not actually used in the code paths we exercise.

As we want to allow stand-alone builds of the app, it is much easier to
fake the module than to either include a generated file from elsewhere
in the tree or generate it ourselves.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1133

js/extensionPrefs/js/meson.build
js/extensionPrefs/js/misc/config.js [new file with mode: 0644]

index 56687bf6c255b0e1e8257ab908612fa0a015dd5c..97e568d7c8c91d082ba1f7bcccf3ba47bc8d69c9 100644 (file)
@@ -22,13 +22,10 @@ configure_file(
   install_dir: pkgdatadir,
 )
 
-config_dir = '@0@/../..'.format(meson.current_build_dir())
-
 gnome.compile_resources(
   app_id + '.src',
   app_id + '.src.gresource.xml',
-  dependencies: [config_js],
-  source_dir: ['.', '../..', config_dir],
+  source_dir: ['.', '../..'],
   gresource_bundle: true,
   install: true,
   install_dir: pkgdatadir
diff --git a/js/extensionPrefs/js/misc/config.js b/js/extensionPrefs/js/misc/config.js
new file mode 100644 (file)
index 0000000..d213b78
--- /dev/null
@@ -0,0 +1 @@
+/* Fake module to satify import in ExtensionUtils */